Should fix #66