Fixes 2533132
Build files