Connect Bug Fix