fixing magic numbers