Fixes #668