Corrected compile error after master merge