Comment driver fix