Fixes #416