hopefully completely fixed the int limit problem