Fixed most of the bug with catching names