Fix for recent fb changes