Issue 1010 fix

Yes, agreed. OK.