fixed constant references