Fixed BugTicket#14