Fix for #233