RPV-222 - Hotfix