Fixing a small bug due to the remaining