Should fix #1263. Please test