[master] Final debugging