Added patched version for solder-impl