populateDefaults / fixes #321