Finished with master fix