Fixes #492