reverted try length fix - but added a FIXME :)