updated from version 1.5.8