Second attempt to fix annoying bug!