Possible bug fixed