Resolved the Errors from last commit