fixing issue #30