Commands fixing