Desparate attempt to fix "I've done it" bug...