fixing issue #60