Surround with DEBUG check