fixed bug in the last bug-fix