BUG: fixing issue #3111