Add debug version for @thradec