Fixed Issue 22