Bug fix: Wrong way to do this