Fixed Logic error 3