UPDATE: issue #128