Feature/fix enum bug