Quick fix for parsing commands