Fixed magic number issue