[jmugan]

I was just thinking about that scene the other day as I had initially gone in to fix a small bug but ended up staying for a chain of fixes.