Fixed possible overflow-flaw