! fix #1687

Signed-off-by: Spuds <spuds@spudsdesign.com>
! fix #1677

Signed-off-by: Spuds <spuds@spudsdesign.com>