Fixed TypeError