Addressing #15
constants reorderings