Minor bug fix for 1.3.8 

Please review the patch and merge it for the next 1.3.8 release.