Fix the magic numbers