Updating patch as per the comments #60 and #67