Fix bug #548

There are lots of constants used as value around the code, should we fix all of them?