Fixes FB loading issue; REVERT