Fixed Issue 19