fix package independence