Completed #346 impl