Fixes #510