Fixed Issue 20