Strict fix on 4.4