Issue #18: Added prototype listener needed to fix