And fix #240