Fixing unbinding issue