fix for commands