Fixes

Fixes #1640