This change could probably stand some unit tests.