Fixes Issue 17