Fix for #235