Fixing issue with odd P tags