Add simple debug handler
Fixed conflict