removed some overflow