Fix for -trace option