Issue 584 - PR Follow up