Minor change, should really do this locally...