Quickfix for #41