finished issue #66 #27