Bug Fix.Enter to Leave