Fixes #503