Fixes #1418
Fixes #1419