Fixed bug on load