FIX some unwanted behavior