Fix for not yet existing commands