Made compile error free after merge