kiran(kim)

@jpillora We are experiencing the same issues described here, and this PR will resolve them. Could you please review and merge the PR?