Incorporate fix for issue 642