Should fix #678