Bug with remove control