We give a partial answer to the following problem: Is every finite comma-free code is completed to a finite maximal comma-free code? Namely, we show that every finite solid code could be explicitly embedded in a finite maximal comma-free code. The construction relies on an investigation into some structural aspects of maximal solid codes that has an independent interest.