#649 - PR followup