Fixes #459