Fixed FB11710, better solution