Should fix #47.