Another fix attempt