Fix annoying behaviour