fix #265
fix #266