fix 7e15a61 - see comments

We might need to find out why this behaved differently.