Fixed per issue #60