Another bug fixing thing