eliminate debugger call and fix time bug