Fixes #497