Yet anoter fix