fixing factor issues