fixed PR #6