magic number issue resolved