Fixes #487