Fixes Critical error in single element changes