Bug fix at loading.