fixes #162
bug #164 follow up