Fixes #3342 

This PR contains changes only for determination. We will be implementing
the same approach for other forms as well.