Take 3 for forge 1.7.X fix