Solve trivial unlikely race condition
Add type to constants