Fixes #500