Might fix #730