Shorts - Issue 17

Issue 17 1