Fix issue622

Fixes #622