DEPRECATION fix and use bundle for travis