fixed to adapt to better storage