Fix remaining bug!