Bug fix...hopefully :/