restored old behaviour with new config