Implement Update 5. in #91 issue