Dec-Fix2

Fixing opportunity's performance issue