Fixes #1613
Fixes #1616