Fixed bug wrt new place in enum