hacky patch to prevent debug out string generation
merge master