fixes #1644
fixes #1644