PDIOMON-8 Fixed minor bug from merging