Updating to proper cast