Added support for short, int, and long overflow