Fixed includes/is-active