Fixed #78