fix #26, #27