fix #2 enhancements