defaultsTo conditions fix