fixes #186, fixes #185