fixes #131 #132

Closed gianpieropa closed 2 years ago