Remove magic number fixes #736