1609 another change, same PR