Should fix #1323