Fixes #1548, #1550