Revert last commit and try modified changes from travfix branch