extended #1.2.1