Fix for #54