Issue #177 - Recover code deleted in the merge