Should fix #70