quickfix for #25