update to trema @ 5166b7e