Title: EClean Issue 18