fix 1 didn't work, implementing fix 2