stackTrace + bugfixing