Fixed some weird bug, ask Dan.