Fixes a small bug, though not completely