Adding one more case to the hack. I'm not sure if we are going to go through with this, but I'm committing anyway so at least I'm handling all the cases.