Fix regression introduces by 81d88887