fix #30, #27