|#969|Fix nasty bug