Possibly fixed a bug?