temporary fix for incomplete output
credit changes
Merge branch 'origin/master'