issue 286 update