fixed for #25