Fixed generic policy to sometime more suitable