Removed buggy code