Magic number fix