fixing bug (not yet)