Fixed issue of fragment crashing
Merger with remote