Fixed as per issue #3