fix that nasty bug