reqired changes after pull-request #17