Fix for #188