fixed bugs
Merged fetch