fixing issue #78