Commander fix