Temporary fix for #648

This is a temporary fix for Issue #648 which will be removed when the setup-wizard is available.