Quick hack fix for bug on load.