fixed issue 383