Previous fix didn't fix. This is actual fix.