deprecated bug fix and support undeprecate