Fix bug, hopefully