Fix performance bug, perhaps?