Should fix #830