Fixing long bug