Fix issue 389