Good catch, I've found duplicate code there and refactored it to use the same code path now.