Forgotten pieces to the previous commit --kazu