for #192, enhancements