Fixing small bug AGAIN