[#517] Debug patch