Issue 515 Fix