Really fixing enum problem this time.