#54 Replaced defaults