Bugfix for pedelman's Surround plugin