Should fix #80.