Added safety check that really shouldn't be needed