removed todo #117