Fixed error caused by replacing certain constats