updated (fixed fetch join)