this time really fixed the bug