YAY (final fix and I even know it works this time)