fix for skywalker2 demo