add a config switch
hopefully test be ok
and travis happy