fix annoying bug!