fix #19; fix #6