Issue 653
