fix timing issues + conflict with args for tracing