Bug Fix register process
Merge statches