fix for issue 35