#743: #726: more still

opened by thuchacz