done issues #90, #93