This fix breaks everything :) Have you tried to run tests?