fixing popping effect (in progress)