Cont... fix for #324