Issue1121

fixes #1121