Fixing more overflow