Fixing garbage case on some variables