fixes #1216
fixes #1209
fixes #1208