Actually fixed that bug