Added some debug info for bug fixing