Should fix #306.