Fixes Issue 19.