BJORN: BUG FIXING

BUG FIXING