fixes #1268
fixes #1264
fixes #1265