Much more elegant bug fix