Fix for #190