fixes #1207
fixes #1924
fixes #1941