First pass for Issa #324