Fixed issue with RV25