RPV-217 Fix for duplications