fixes from vasilis. fixes #91