They do that by default
Looks like this is a bug in 5.4… works correctly in 5.3
I would suggest reporting it