Duplicate command fix