bug kind of fixed