Found and fixes another issue concerning last commits