partially addressed issue #8