fix problem created in commit 4590d9b2651c918df79ed0d456f9ebfe58f3709c

Also see comments on 49220e4104d95276e7f8d6a248b8ee16ea5c4649