changed behaviour, tests broken