Fixed bug from long ago