Fixed issue with two solution fields