Fix hidden overflow