Quickfix for #585