Fixes #406