fixed #40 #23 facebook