fix #28, #27