Fixed Derek's bug!