Fix unwanted behavior