Fix for #26