merge fix
added active