zajo Fix for Issue 53