fixes issue #25
addresses issue #24