Short fix to the last one, which does basically what the other one should have