try to solve bugs