#1361 - Defaults were wrong