Resolved thread blocking issue