Fix as per Know Theatre request