Resolved Issue-479