Added another fallback to the mix #2012