Solution Fix for 090

Solution Fix for 090