handling one more weird behaviour case (not fully)