#18, fix for enums and templates