CON-1016 | MagicNumbers are bad