fixed a possible bug?