Fix for fav bugs