Fixed fb duplicaation