IMPORTANT / Fixed ClassCastException due to uncasted number values