fixed a bug?!