fixes #126 #133

Closed gianpieropa closed 2 years ago