Command Pattern Fix