further fixes
Merge pull request #874 from Pomax/bug825

further fixes