better initial defaults handling