Could clear up #2031