Removed ugly enum constant hack