Fix (removed a workaround that was nolonger needed)