master bug fixed