Legend issue Fix

Might tweak some more before final submit.