Fix attempt no.2