I'll add a test and rebase and will let you know