Title: EClean Issue 43