fix stacktrace + remove trailing _