possibly address issue 364