address issue 287