fix for the bug (?)