this seems to do the trick about #656