This is going to do the wrong thing at some point. Fixing it on Lucky Fabb now.