Merge branch 'kazuho/issues/301' (fix #301)