Updated for possible bug