need to fix overflow exception