todo should refer to JFG issue