Should fix travis issue #792