Acceptable API

Skip if statement since router handles it, a little bit inconsistency

but internally so it should be acceptable