Fixed bug (hopefully)