Should fix #1026