Attempt #2 at fixing EXP command