fixes #633

attempt to fix some loading sequence issues