temporary solution for traces alignment issue, need more generic way to fix it