fixing issue #420