fix #26 #31

Closed couleurmate closed 6 years ago