fixing issue #133