Changes according to issue #163