Really fix bug
Merge branch 'dev' into wrd-far
Tweak wrd-far