fix #223 / #226 for version 1.0