Added some fix for debugging