Fixing Ugly Issue