Possible bug? fix