System Editor Fix

v1.0