Moved to simplified packages and works like a charm