fixed for #30