damm, this code duplication is maddness. Of course I fix it.