Fixing properly