Fix the glich