Fixed Thomas's commit