Fixed broken build due to merge