Prod-ready player fix - not perfect yet