final fix before app breaking