Fixing conflicts occuring due to contexts removal bad handling.