Work around for hard coded flavor