temp fix #82 and fix #81