Issue 610 patch added