Fixed more null motor issus