Fixes base load issue