Fix Calulator from not building with 4.3 r3.1