Fixed Logic Error 2