[Master] Fixed the order

Conflicts:
	main.js