Fixes #476.