fixing issue #325