fixing issue #71