Fix #725

@joneshf @garyb Please review ... 

Thanks.