partly fixing issue #15