2nd attempt on a fix