fixed possible bug?