Fixing bug, dammit