Update to correct behavior