Fixed #94 #95