Fixes #600