fix issue 27 #27