ivan-fix-april-2017-small