Fixed the concerns raised in https://github.com/gem/oq-commonlib/pull/34