Quickfix for #23