Bug Fix, Possible Inf Loop