Simplification of last bug fix