Fixes #199 failing travis test cases