removed buggy code