Fixes #546