Bug fix Master process