fix #111 again