Added issue_055 and issue_056