Should fix #365.