fixed overlapping constants