fixes #28
#160