Fix #4 - Prototype