avoid real vector space
Merge branch 'mirok/fix-issue-409' into next