feature 1.1. fix