fixed for #32
fixed for #29