Fixed issue with 2NF.

Fixed issue with 2NF.