refactored FB fix