More magic number removed