Yet another attempt to solve sauce issue