fix hybrid storage