Fix a problems in master.js