fixes #1317
fixes #1318