Fixes #1543