Fixes #476