fixing issue #21