addressed issue #80. Not sure it looks good.