Fix for #22.