#238 second attempt.. seems to work now