finally fixed 5.3 builds