resolved #1: the first version