Fix X and Y scaling