Actually fix that bug