Changed constants as variables, fixes #5