Fixed Integer == vs .equals() bug