fix for issue 37