#7 revert try fixes