Fixed :: Data defaults were being modified by new settings defined during a call