Should fix #100