Another cleanup := make it equal to OpenDMX