Have made a big change, resulted in running into a buggy situation.