there should be tests for this change