Quick fix for calling commands