fixes #566 - merge FB