Fixing a previous bug!