Fixed? some bugs