beacon fix
merge