Operative version
Fixed merged