fix #23 (3rd commit)