fixing issue #23