Previous fix didn't work. New attempt