Fixes #498