see if this fixes #307