Fixes bugs on command execution trackability