Solving Issue #30 (1st configuration wizard)