Fixing overflow