Change following Travis suggestion