fix for issue 8