Solve issue #25 #26
Solved issue #26m, for real