fixing duplicated DOM related behaviours