Possibly fix #1336