fixed Constants conflict