Fix issue #218 and may be issue #217

Package-Manager: portage-2.2.0_alpha173