Fix attach storage