#85 fetch fixed