#ROBE-138 debug issue fixed