This behaviour should be explicitly unit tested