issue#127 - unfinished