fixes for last fixes d6167754a790c524dff429a65f7d4231404f1681