Should fix #63.