Fix for stack trace