Previous fix did not work