Feature/525 fix related works error