Fixed onCommand return