Fixed build error after merging in master