fixing THE bug