Fix for 5480, 5030 errors on 15.1