fix #26 and #27