Fix bug in remove current