issue 384 fix