Issue#364

fixes #364 (+ new issues for testing)