fix for issue 46