last fixes with default values