Fixes #1395
Fixes #1424