Bug-fix:

 - Use enumerants instead of numeric values