Ah right, definitely worth adding then as the current implementation doesn't handle that!