Logic change for consistancy purposes.  #1732