FB ref

242105b as per issues #521 

@gidsg