Fixed empty pacakge problem, renamed variable left from original context.