Implementing issue #202 for garage.