second commit #3479