Work-around double commit message