fixing issue #215