pull #3786 - Make Travis CI build passed and fix an error