key_commit: #2016 - Bug Keeping us From Attaching Fees When Site Swit