Fix save to storage