Should fix #366.