Added fix for #58 from project template