Fix for #201