Fix for FB 4.7