Removed magic number bug