Fixing moved entity relationship encoder. Fixes #62