fixing issue #1454