issus #3 Temp Fix (Need to Test!)