Awkward fix from 01c9435