multiple issues (#105, #104)

fixes #104
fixes #105