Fixes #1393