Title: EClean Issue 52