Quickfix for e7ab07