I hope this commit will be last or I will die()...