Fixed Issue 18