Some bugs were removed