Fixed problem after merching the Om-oss branch