BJORN: bugs fixed

bugs fixed