Issue #160 - Fix a conflict between Code and API