Fixed the fetch problem

Need to clean it up.