Bug Fix

Fixing the spacing around joins