fixing issue #48