Previous attempt at fix did not work