Fix bug uncovered by travis build process