Fixed magic numbers properly this time