Unstuck command improved