Should fix #928