Fixes: #2918 Fixing base modifying