- fixed a possible bug