Follow up #120
Follow up #120