Remove ugly eval and get .apply working