Fixed Issue 24.