#78

Fix for #78