fix for issue 236.