Should fix #341.