fix issue with invoking commands