Fix problem with lazy initialisation