fixed issue 1602 again, thanks Alan