Removed potentially annoying behaviour