fixes #1053, fixes #924
fixes #836