Fixed Issue 51