fixes #785 - merge FB