XXX Do a few changes in order to debug the issue