#154: solved