Fixing some patterns