Updated to fix bug noticed by Travis CI