fix for issue 50