fixed on 5.2