Maybe this fixes that stupid annoying bug!