Fix for nested packages