Fixes that bug again