Fixed observers getting added twice