#128 & #129 impl