fixed FB ref
optimised