Now working on 1.8.7 as well

Signed-off-by: Bert Hajee <hajee@moretIA.com>