Forgoten change when switching to Integer from long in some cases.