fix problem for #26