Bugfix context weighting