Constants use fix