Adress open TODO on #254