Fixing modifications #533