@emanuelandrada could you please create a small test case for this? The code is correct so if you want, merge it and then work on the test later. Thanks.