#4 #5 closed

pretty important fix )