Fix compitable with 4.4w issues