Fixed with_connection