fix for issue 6