fix for the 2 last commits. too many changes at the same time :/