two commits - one semi-bug, one improvement

Tested on two separate systems and littlewires.

Marcel