refactoring
fix to work correctly when running from x64 mode
tracing