Fixed bug with UI fields in taker