Hopefully will resolve #736