Finished fix of kotlin enum