reloading fix
fixed issue #491
resolve merge conflict
resolve merge conflict