Fixes #2738

Only 6 months later than I could have fixed it!

#FreeTheTinCans
Merge pull request #4321 from Incoming5643/tincans

Fixes #2738