fixes #60
also #60