Added experimental option to possibly solve live issues