Issue1058

fixes #1058