Fix for improper enum use