Fixed solution + package restore