One more bug fix

v1.2
Merge remote-tracking branch 'origin/master' into r_feature1
Another bug fix

v1.3