Fixing up my derps