Fix for #203